Use less hackery.