Reverted remaining arrays to "old school" style (i.e. [...]).  NSMutableArray alternative still exists, but are commented out; will remove in a subsequent commit.