RF: switch a bunch of easy ones
RF: four more

Aperture.contains() is completely untested