More minor code cleanups

[asaarilahti]

• add final modifiers
• remove more deprecated usages
• minor simplifications to some statements
• remove unnecessary throws
• add types to generic types where missing, use diamond operator when applicable