Custom block definition style tweaks. Fixes #5