Minor maintenance changes.
Refined implementation of ShipTypeAndSizeAnalysis + unit tests (AISAB-13). Also removed unused import statements.