Better use of new constraints

less reflection == good