Two-pass drawing on things in automap

Plus some minor reformatting.