#86: Fix various style issues introduced by support library v21