Fix generation of routine-{sub,method}.html
Code clean-up