More clean-up in descriptor parser code

While going over !22 (merged) I realized we might want to fix up more in ExtraDescriptorParser.java while we are at it. This will happen in this ticket to not pollute !22 (merged) with unrelated stuff we should not forget, though.