Incorporate suggestions from mxxcon (fixes #1)