Some minor changes, cleanup pulled from jco's macro branch

These feel like they can/should be discussed independently of the other branch.