Cosmetic changes to follow puppet's best practices
Fix postsync's broken check logic and simplify syntax
Properly remove use/keywords/mask/unmask when no longer specificed

Also keep the same order inside the manifest to increase readability.