Remove autounboxing - use primitives.
Use short-circuit operator in "if" statement.