Cleaned up usage of BIND_PER_PRIMITIVE where possible.