Unfuck more meter-shim things

Just simplifying the craziness.