Cleanup metamethods a bit