Resolved ambiguities in extended prop class

...but now the scan visor is broken. *sigh*