refinements

Signed-off-by: Adam McNicol <adam@mcnicol.me>