Tune type mappings for better Boolean support #513