More 1.5 port work (and general cleanup). Still doesn't build yet.