Small detector simplification that addresses issue 215 and picks up a net +4 more...