Should we have system-specific idiosyncrasies hard-coded in?