Some cleanup, and make :exclude-constant and raw constants work again