Unfuck more meter-shim stuff