Trivial cleanup
Sync'd with forum