Not a necessary change, but this would *probably* decrease compilation time dramatically. Somewhat related to #240 .
