Reactivate and tweak shortcuts for getters and setters