Update code to use newer syntax for @[], @{} etc
Reformat code to match appcode (will mean less formmating diffs going forward)
Apply suggestions in appcode to reduce warnings (will mean appcode warnings in future won't drown in a list of low-relevance warnings)